Rename ostree-grub2 to ostree-boot. Move all initramfs and bootloader integration...

diff --git a/debian/changelog b/debian/changelog
index 7f16f028cdd3e465e1414193253ffc4e01c520c9..9ba51ce31915b13b799f363e42acdff3f78d2d6b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ostree (2016.5-3) UNRELEASED; urgency=medium
+
+  * Rename ostree-grub2 to ostree-boot. Move all initramfs and bootloader
+    integration there. (Closes: #824650)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 08 Jun 2016 11:58:01 +0100
+
 ostree (2016.5-2) experimental; urgency=medium
 
   * Add a patch to skip the test-parent test if /var/tmp doesn't support

diff --git a/debian/control b/debian/control
index e2131251f427b22b7bdb4aaa1badedcd40fb6fe8..33bd6aa43020ae3d71ffe164498fea1f804f16ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -123,29 +123,42 @@ Description: content-addressed filesystem for operating system binaries
  parallel-installation, particularly useful on "fixed purpose" systems
  such as embedded devices.
  .
- This package contains the executables.
+ This package contains the executables used to manage and create
+ filesystem trees. It does not affect the boot process for the system
+ on which it is installed.
 
-Package: ostree-grub2
-Architecture: all
+Package: ostree-boot
+Architecture: linux-any
 Depends:
  dracut,
+ ostree (= ${binary:Version}),
  ${misc:Depends},
+ ${shlibs:Depends},
 Recommends:
- grub-efi-amd64 | grub-pc,
-Description: GRUB 2 configuration for ostree
+ grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot,
+Breaks:
+ ostree (<< ${binary:Version}),
+ ostree-grub2 (<< ${binary:Version}),
+Replaces:
+ ostree (<< ${binary:Version}),
+ ostree-grub2 (<< ${binary:Version}),
+Provides:
+ ostree-grub2 (= ${binary:Version}),
+Description: ostree boot loader and initramfs integration
  OSTree is a tool for managing bootable, immutable, versioned filesystem
  trees. See the ostree package's description for more details.
  .
- This package contains configuration snippets for using ostree with GRUB 2.
- This integration currently has some limitations:
+ This package contains configuration snippets and executables needed to
+ boot a Debian derivative using OSTree. This integration currently has some
+ limitations:
  .
   - the initramfs must have been made using dracut
   - the root filesystem must be one that dracut can mount without a root=
     command-line argument (an EFI partition with the GUID defined in
     the Discoverable Partitions specification)
   - /boot must be a separate partition
- .
- See README.Debian.gz for more details.
+  - the boot loader must be one that is supported by ostree, currently
+    GNU GRUB 2, syslinux/extlinux or Das U-Boot
 
 Package: ostree-tests
 Architecture: linux-any

diff --git a/debian/ostree-boot.README.Debian b/debian/ostree-boot.README.Debian
new file mode 100644 (file)
index 0000000..f156b6a
--- /dev/null
+++ b/debian/ostree-boot.README.Debian
@@ -0,0 +1,10 @@
+This package contains configuration snippets for using ostree with GRUB 2.
+This integration currently has some limitations:
+
+  - the initramfs must have been made using dracut
+  - the root filesystem must be one that dracut can mount without a root=
+    command-line argument (an EFI partition with the GUID defined in
+    the Discoverable Partitions specification[1])
+  - /boot must be a separate partition
+
+[1] https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
new file mode 100644 (file)
index 0000000..7e2f375
--- /dev/null
+++ b/debian/ostree-boot.install
@@ -0,0 +1,8 @@
+etc/dracut.conf.d/ostree.conf
+etc/grub.d/15_ostree
+lib/systemd/system/ostree-prepare-root.service
+lib/systemd/system/ostree-remount.service
+usr/lib/dracut/modules.d/98ostree
+usr/lib/ostree/grub2-15_ostree
+usr/sbin/ostree-prepare-root
+usr/sbin/ostree-remount

diff --git a/debian/ostree-grub2.README.Debian b/debian/ostree-grub2.README.Debian
deleted file mode 100644 (file)
index f156b6a..0000000
--- a/debian/ostree-grub2.README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-This package contains configuration snippets for using ostree with GRUB 2.
-This integration currently has some limitations:
-
-  - the initramfs must have been made using dracut
-  - the root filesystem must be one that dracut can mount without a root=
-    command-line argument (an EFI partition with the GUID defined in
-    the Discoverable Partitions specification[1])
-  - /boot must be a separate partition
-
-[1] https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/

diff --git a/debian/ostree-grub2.install b/debian/ostree-grub2.install
deleted file mode 100644 (file)
index a4bcce2..0000000
--- a/debian/ostree-grub2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/grub.d/15_ostree
-usr/lib/ostree/grub2-15_ostree

diff --git a/debian/ostree.install b/debian/ostree.install
index 0f5391424af9288b09521a153a23a683b73ca6e6..4e555f92fdbfe46ad271d8cc0892c63d23ff4b24 100644 (file)
--- a/debian/ostree.install
+++ b/debian/ostree.install
@@ -1,10 +1,5 @@
-etc/dracut.conf.d/ostree.conf
 etc/ostree
-lib/systemd/system/ostree*.service
 usr/bin/ostree
 usr/bin/rofiles-fuse
-usr/lib/dracut/modules.d/98ostree
-usr/sbin/ostree-prepare-root
-usr/sbin/ostree-remount
 usr/share/man
 usr/share/ostree/trusted.gpg.d